Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 28 Jan 2010 08:56:33 +0000 (08:56 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 28 Jan 2010 08:56:33 +0000 (08:56 +0000)
commit1b006a33f27f9046ddaac48be8a3555a97fe0695
tree5e94361e8344e4cb4573b351ce4a39f2ef89bbe2
parentff55b1f59ed2a51b2af394d3ab319063509b4389
parentf4987128320eb68a162bd4e12b690f0b8c72eea1
Merge from mainline.